Remove unused classes
Fix issue where repeats were breaking