In advance of some migration work, remove some unused classes, extract
some color variables and organize.