tidy up some more and move android stuff into android only