cleanup redundant conditional