let's remove the commented code