LPIS: remove needless geom class, cleanups