Stop subclasses overwriting each other; remove unused spec