Removed some detritus.
Packagers config improvements.