Removing deprecated classes.

Closes #2204 
:boom: