get rid of fb dependency