Remove the unused commented code