Cleaned up master, login, default and admin.