Update documentation and remove unused variable

Change-Id: I2c87af166b3e7e31ad5b6771f465896f05c6f287