Remove features and edit tags controller
Merge pull request #915 from JamesGlover/cleanup_unused_features

Remove features and edit tags controller