compile cleanups