Remove conditional branches that are never called

@tallented - I was cleaning up the conditionals and it appears those cases aren't hit in the tests so I removed them. Thoughts?