removed unused code, debugging output disabled