clean up (also fixes CyanogenMod)