revert gpm changes, remove bson from godeps