remove unused logging & testfix