Removed FB fail and cleaned up