some initial cleanup
Merge remote-tracking branch 'github/master'