Did some mock NC client cleanup