Environment made as clean as possible and prepared for AMD integration (#95)