Merge "Delete dead code" into mnc-dev