Removing a lot of dead code and freeing some space in the UI