Removed unused classes
Made slight progress to collisions