Cleanup old commented out code

Change-Id: I9b225aa121865fedb0c86bc09e7945a9f13c0135