FB refactor and dereg