Remove these templates as well