admin module code cleanup