admin modules code cleanup