more clean up for basic aosp stuff