PEP8 changes from core

Change-Id: I2e52ca27eea56a2fb42844e5bc928b95945f65e6
remove out-commented lines

Change-Id: I260b9fd0e61744dfce0a4f75554e21bf940ae4c2