[PATCH 00/10] legacy gamma code cleanup