Major deletion! \o/
Fix template tags
Merge branch 'del-legacy'