cleanup - second step