Added funcionallity that remove debug code