Removing commented code

(cherry picked from commit e40ee881a654a344cc27cf9ad221ac9c71967eb5)