Clean-up some code
Removed other buttons, since they will no longer work and we need to get the common backround task to work instead