unnecessary clone removal
more unnecessary clone removal