Moved call to remove player from playerClass HashMap to above switch statement

Fixed code duplication