Add cleanup shell (closes #20)