- Fix #919 and addressing #671: Option to prefer push and a force send sms
- Remove duplicate method