cleanup as a result of putting together my Philly++ talk