Cleanup of unused variables.