A proper clean-up