Clean-up code. Remove debug buttons.