remove relicts of Dem3Dof and code cleaning