Merge "Code cleanup: remove unneeded lines."