Merge "Removing unnecessary comments"