clean up from sts merge