Cleanup project after merge