cleanup from prior changes