Code-cleaning after GFB