Remove debug code and commented (redundant) code