0.2.1 - more aggressive cleanup