nasty debugging leftovers removed