removed all extra references. Minimal set is left