Remove deps to pkgs which are going to be removed with 1.5/1.6