Debug messages cleaned (still not working in 2.0, please be patient)