@dubiousdavid AMD compatibility pull request plus cleanup