Cleanup unused variables