Cleanups for validation