Remove residual debug code...