No, I didn't remove NO_PREP and PREP, they are still actively used in bson.c. It does a little more then just adding _id (such as fieldname blocks).. I haven't done any refactoring yet, just code removal, in the other PR