Remove unused variables
Update description given recent code changes