- Code clean-up: moved debugging code to sections wrapped in #ifdef DEBUG