Remove some more AOSP