Fixes. Removed templates.js