Make cleaning up modes easier/sane