Some cleaning up in Game Engine