Oops, removed some debugging stuff from last commit