Fb code cleanup 2