bug17361 : debugging cleanup