Small cleanups in prep for future refactors (remove eigenclasses, no require_dependency)
Merge pull request #1678 from smarterclayton/minor_object_cleanup

Merged by openshift-bot