cleanup and properties validation.