#220 poc remove all references

fix #4