Remove traces of clone()