remove suspend-related munging from nurseshark draft and tests