excessive debug cleanup