Batch 2 of master branch clearing