more cleanup
Merge branch 'master' into ryan