Fix-ups: remove unused import & var, add more docs

Change-Id: If7399eeb45295a1a5a99315bbbdcf096ad0b9a65