admin modules cleanup and bugfixes