Clean up of staccato-manage.

Change-Id: I68731d5f56bd4db2a94061768e9da3f87e627fe4