More conditional can be removed