Remove d2to1 usage

We don't need d2to1 anymore.

Change-Id: Icbfa11f844600720b344a304439162ba5e49cc9d