minor tweaks to support the 'clean' task