First stab
Initial cleanup. Some modules must still be probe-ified
Now passes test. MFA entries remains. Cache reactivation remains. Igor remains
Removed unused code warnings
Removed additional warnings
Fixed merge issues