cleanup, debug message and duplicate row