Removed FIXME stuff in GameController