Cosmetics
Handles registering refactored
Unused imports removed