Prepare for AMD-Support #2, Clean-Up