Debugging

and cleaning up the old stuff