Cleanin up debug code; removing commented code