cleanup
berkshelf update
remove cruft