Merge "Add more logging message and dead code"