Cleanup of switches leftovers See merge request !1212
mentioned in issue #1216 (closed)
mentioned in issue #1351 (closed)