Merge "Hygiene: removing unused library"