Cleanup DEFINE_SIZE_VAR2
6 files changed