Massive cleanup of existing VariableProviders