some debugging cleanup