Removing unnecessary classes, it turns out it's simpler this way!