Cleanup, adding new configuration class, marking old config as obsolete