Returned back cross-building; removed setting keys; tested