Remove some debugging code and fix Conformance controller failure