clean-up continued