Cleaning up master
Cleaning master