doubleshot: cleanup ION and add support for 4.4.4