Transfer from original repository, clean, up and AMD