First stab
Initial cleanup. Some modules must still be probe-ified
Tmp
Let's see if some bugs have been fixed.

Merge branch 'master' into mf-probe-cleanup
Now passes test. MFA entries remains. Cache reactivation remains. Igor remains
Removed unused code warnings
Removed additional warnings
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
Integrated from master