Android API check cleanup