Validation cleanup, packages done