tidy up master branch