Remove unneeded conditional