'admin' module cleanup, minor improvements for runtime context