cleanup before 1.5.8