working on validation cleanup