Revert "Revert "Slimmer package""

This reverts commit d20381205cff0763cfa009a167c95c26b0cf25cd.