Unused variables removed