Remove Validate from struct definition