Got rid of unneeded template code