Massive cleanup of previous templating logic
Removed useless configuration variables