Remove some logically dead code