Update: let's clean up some things, if possible