GPU version - more cleanup