WASM next code cleanup