udpating cleanup bug