Merge "rm log spam" into nyc-dev