remove temporary cruft
Merge remote branch 'origin/reference_elem' into reference_elem