moar async cleanup