fixed celanup()