cleanup and workaround for AOSP