A little more cleanup on things that should be cleaned up in the editor