commit before deletion of old non-entity member code