FB detection cleanup