Merge "Remove DEBUG to fully genete jjb"