cleanup from sts merge