Remove else in others functions