Cleanup 4.1.2.2 earlier