(PUP-2287) Remove dead code paths, fix stale comments