Removal of Commented and unusable code