REALLY removed the debug code this time...