Removing unused/commented code