Extra generated data cleanup added.