Cleanup feature for #7