Remove Sokoro stuff from master branch too