This is the final patch removing some old remainders that are
not needed anymore.

(Other clean-ups were done in earlier commits)