initial clean-up