natas update + cleanup