Removing collection types, overkill / implemented better by others