Removing some extra code and classes.