Fb code cleanup 2

I believe once this branch is merged, "fb-code-cleanup-1" will be obsolete.