Fix merge conflicts and cleanup related items from the NMJv2 pull