Some cleaning
Removed _n_geom_els
Merge from master