CS-5460 More clean-up of package