cleanups and such