CleanUp master branch