Removed unused code.
Geometry seems to work. Next step is fields.