cleanups + dependencies