FBAUser code cleanup