fix block not deleted issue during promotion and data folder fix