Cleaned Up to Wave 8