Fixing removal of bondtypes from data structure.