Tidy up comments & remove commented out code.

Change-Id: I46dd5ce06f36362c6274511cd1531d93926aa9bc
5 files changed