Remove unused views
Merge branch 'master' into feature_remove_dead_code
Merge pull request #36 from kabisaict/feature_remove_dead_code

Remove unused views