Template clean up, don't think I can change function names because he calls this dynamically from ycm.