cleanup for JS compat
cleanup