Remove unused imports, refactor old code.
Merge branch 'master' of github.com:brunch/brunch