remove killswitch logic (unused and will not be used in the future either)