Issues/2204 remove obsolete classes

Redoing the PR in  #2639.  
Closes #2204 
cc @sendhil