debugging cleanup