Clean up google maps code. (Issue 87)