removed lots of validation errors