Cleaning up admin structure