Further updates to remove tr1 completely.