Merge "Remove some of the unused assets" into nyc-dev