more cleaning of master branch