Cleanup and PE additions