and changed location of cleanup back to original position