cleanup and now up to Q10