Cleanup google module
Fixed silly merge bug