removed some debug stuff from this branch