Removed unnecessary input validations