code cleanup before possible express upgrade