next WASM code cleanup