Removed dependencies on templating