fixed android code
remove old code