Clean up some things