Some debugging cleanup. More to come