Removed that Entity_enun bullshit.