migration validator cleaned up