Remove the "single" debugging code that has probably been there for ages and