- removing more debug stuff