removed all template stuff