[IMP-dev] Minor cleanup to bonds