Removed last of the non-mustache templates