cleanup old comments and debugging