Remove commented out code

Change-Id: Id9dd8934c80bbe3bbc88df77a6da2eb52fc70b24