Templating and delete unnecessary functionality
Merge branch 'develop'