Cleaning up redundant classes

Found some classes I forgot to clean up.