clean up after ourselves
Merge remote-tracking branch 'origin/master'