some more cleanup and buggy keys handling
use pipeline to migrate faster