remove un-needed conditional