Merge "Some code clean-up." into mnc-dev