Merge "delete obsolete aliases" into nyc-dev