nsbcompile2: Cleanup