Adding kill switch for commercial js