massive cleanups