Cleanup for movement to getSimple format xml