Stop failing when cleaning
Patch in IR support for CyanogenMod and revert some stuff for jfltexx