Removed some unreachable, unnecessary code.

This resolves CIDs 76129 and 76130 (Structurally dead code).
Merged the latest from the 'master' branch.