slight refactor to remove old code from critical path as I rewrite them.
No Javadoc errors.
No compiler errors.
No Checkstyle errors.
No PMD errors.
Only findbugs left :)