and remove the commented code