clean & update stuff