removed more android stuff