further cleanup
further cleanup

ddmck/Empirical-Core,ddmck/Empirical-Core,empirical-org/Empirical-Core,empirical-org/Empirical-Core,ddmck/Empirical-Core,ddmck/Empirical-Core,empirical-org/Empirical-Core,empirical-org/Empirical-Core,empirical-org/Empirical-Core,empirical-org/Empirical-Core,empirical-org/Empirical-Core