removed some validations