Cleaning before merging with master