cleaned up auto generated template stuff