google outh and some cleanup