Deleted some classes to match the goals of sprint1