Round one clean-up