Further cleanup
Some additional cleaning
Merge branch 'master' of https://github.com/golems/grip-samples