Clean up 16 Set 2006-10