Some cleanup. Prepared new config panel.