validation cleanup