Undo some debugging stuff I left in