Rearrange phases. Modifier cleanupShould be readonly