Simplify removing a bond

Bug: 145171640
Test: compile, run and try to remove a bond
Change-Id: Ic89765420d5e52ed5462495cc4bad17a24c13291
1 file changed