some clean up + debugg lines