Removed some Log.i(...) methods and add some at other places