Small cleanups in prep for future refactors (remove eigenclasses, no require_dependency)

[merge]