Clean, removed unused cherrypicks