Merge "Delete unused" into mnc-dev