Remove vestigal code
Allow remove variance within multiple factors