Cleanup; task helper API functions