o Code simplifications and refactoring:
    - Remove some dead code as indicated by coverity.