Removed aosp things