Change removerange calls to clear, remove duplicate methods