Changed order of cleanup array