Clean up clone and fix some utils methods