Remove entityutils references