Added support for updating SAPI target. Bug 323783
Added cleanup command