Cleanup, already had a JDOM Util