Let's get rid of the commented code