Remove unsafe handling of element references
Merge pull request #69 from lpw25/remove-elements

Remove unsafe handling of element references