Merge "Remove not-used code."