cleanedup bondfree.c