cleanups for standalone-compile