Rm unused variables, fix parameter types

Change-Id: Iea01d6d66aabff9dac2b80094abef06c9157f421
Merge "Rm unused variables, fix parameter types"