Some necessary cleanups