Remove refactored FbHandler methods