added ability to remove a reference
solved conflicts with new design