Removed code mistakenly introduced during a merge

Change-Id: I51b54a0b839e30f20d9f84e6b222f6bc513db5ca
Merge topic 'remove_commented_code' into master

6259f175 Removed code mistakenly introduced during a merge