Changed exception message of internal error exception to 'Internal error'
Some cleanup to required_if validation
 - deleted some dead code