Changed the last old comment template usages, removed old templates