Little refacoring , remove some old commented things