Cleanup parser
Rename to bson