Removed hardcoded GameControllerMaker