Remove references to unused debug class
Minor fixes as a result