got rid of dead code and files
Merge branch 'master' of github.com:notajingoist/petal