Merge branch 'pe/cleanup'