#220 poc remove all references