Validation cleanup, enforcements done