cleanup, and store selected sources in e2 settings file not separate config file.