amend
hotfix fb signin
remove un-used code
remove un-used code
fix merge