Using shared config file; removed commented code