Added cleanup during AIP rebuild script.