Performed some cleanups