Fix 'cleaner' - return promise