Merge "A bunch more cleanups" into mnc-dev