excessive debug cleanup 2