Yeah we don't want another nbp situation :) but I wonder, if the cleanup_sdcard works well (because it knows with confidence the location of storage) then do we need these methods at all?