Merge "remove splits" into nyc-dev