Removed debug button on Main menu and cleanup