Cleanup validation