Cleaning up configuration to embed within xenia.