removing uneeded unless