suspend actions: cleanup

Change-Id: I290e06bf51b217cd020c0733acdf22ffb682e196