removed useless conditional