Removed extraneous validations