since new abi, some chance for cleanup too