admin option code cleanup