Clean up and optimize Breed.add and Breed.remove