Remove debug info, also remove empty entity type