AMI cleanup