Remove FB dependency