Merge "Remove --legacy flag"