Clean up and validate