provide more collection utilities and clean out unused stuff