Removed useless conditional