Merge "Delete a bunch of dead code" into mnc-dev