Revert BS changes, take out twilio