Removed un-needed drawing and button handlers