Cleanup for review
Cleanup of FxAUser module.