removed some old debugging
more removal