Remove Legacy using parameter.

Change-Id: I03edb917e95606912a6eebe8e1dd8efad7bb7da3