admin modules: cleanups