Part of series to remove and clean-up GPU code.