Moves create payroll flexibility, but Aoki's return to San Francisco not ruled out