Some major cleanups