As ever, didn't get rid of all debug