Remove "legacy"

Change-Id: I34d0739744f79f35e7474be4a6436feaf3930207