Cleanup obsolete Debug statements