Removing unused commented code