further weeding out some cruft from the initial package.