Remove add category
Merge branch 'master' into cleanup
Merge pull request #83 from ricarora/cleanup

Cleanup