Merge "Minor cleanups to delete support." into nyc-dev