cleanup & update