Do you think its better if we remove all the commented code ?