remove legacy also

Change-Id: I9c55e508d09259f04aa7a017c38f41d68c7af483