Merge "Delete invalid legacy code."