Fixed silly merge bug
Cleanup google module