[greg and jashaad] "refactored out unnecessary classes"