Removed some extra classes