Remove debugging code, or convert it to be selected by kconfig