Remove support for inner swap_handler