more clean up for basic aosp project