Change templates and remove bad expert