Remove extra validation
Add some messages where they should be