Remove commented defines

Change-Id: I0447646127e05d80c87db5b88942105d41d802bd
Merge "Remove commented defines"