housecleaning + newest code