Migration: remove ' from GP code, more logging