suspend actions: cleanup

Change-Id: I7fbcd1ce11b0ea95b7ba874eea6563892d0b0068