Adding undeclared variables and removing unused configuration class.