removing debug code
Some code cleanup