Getting clean and ready for Master

8