Some initial clean-up