some more changes to android & ios

-more android cleanup
-more ios impl