CLEAN - removed old config parts