Cleaning up some things