move validation cleanup