Remove handling for removed buttons
Minor code refactoring + bypass multiplayer screen