got rid of a bunch of debugging stuff