Better cleanup options.