cleanup in google repo impl