Removed a dependency on the JDT