Remove unused variable and deprecated parameters

Change-Id: I38ed73fbc4044b18c4370ddb1c54bb6ec4389950
Merge "Remove unused variable and deprecated parameters"