removing unnecessary stuff
Merge branch 'master' into templates