remove more template stuff