IPA cleanup