performance and clean up for new release of pe