remove elsif in model