Fix typo
Fix unused variable cleanup fail