cleaned up some unnecessary templates