removing unused functions
Removing template tags, moved into templates.