refactoring: remove unused variables and arguments, fix comments

Change-Id: Ibc36af9cf45961ee7c746c819839dc0df5316b37