start cleaning up some things