minor merge fixes (reference to deleted template we are no longer using)