Cleanups, should be quieter when everything works