admin: PEP8 fixes and removal of unused imports
admin: Remove unused imports
Merge branch 'feature-admin-cleanups' into feature-admin