more cleanup so things are loadable