Some final clean-up