cleaned up some debug code to match what's on android sdk.