Cleaning old code out, preparing for a new release.