Remove deprecated options, refactor external call handlers