Removed some bad code in prep for a change to multiple classes