Cleanup more gracefully