Spring clean the 3dnet branch, remove references to triangle shapes