Cleanup 1.7 and 1.8 using block structure.