cleanups and things