fixing unused variables and parameters