Clean up amd wrapper generation