Cleaning for new branch / adjusting for new data without ship2