Validation cleanup, policies done