Cleanup helper