tidy up branch 'master'