Model.GameObjectFactory cleanup