fbb clean up