deleted lots of packages from failed merge with patch6 (taus)