Removed EDE stuff