Remove legacy

Change-Id: I692c70c367b73a43e06110bb29f22c1cd4cd11fa