Removed Unnecessary Classes

Really trying to go for a barebones build here.