Now to admin user and code cleanup