Remove/deprecate/identify legacy code.
EDCM cosmetics.