More cleanup of vendor packages in exchange of ELPA.