- Remove dead code and unneeded comments

Change-Id: I6d29d47d75fc5dfd8d82dace98ee5892aadb7a25