remove debug, is this correct?