removing more template stuff