make kill-switch optional