Repaired CPU version by stripping GPU stuff.