got rid of unnecessary template