Remove the commented code altogether