aosp clean up