Code cleanup for xml configurations.