clean up, update