removed Googleplayservices and some more cleanup