Removing deprecated JDom dependency
Cleanup