PEPs now have descriptive names, remove index