Admin Refactor, Remove Unused code