[Fix] Try singular and plural entity names in /remove.