move cleanup placement