Tidy-up before closing of feature