nasty debug leftovers removed