Removed JES cruft (again)