Shelving partial cleanup
Version 1.0.11-alpha