Cleaning up admin overrides