Cleanup: remove declarations of non-templated classes from classes.h
Cleanup: remove declarations of non-templated classes from classes.h