Merge "Remove pre-N db after successful migration" into nyc-dev