Remove a button that is not used
Some more code cleanup