Begin a cleanup of loop logic