Moved GeometryObject handling into SRInterface.
Removed now unnecessary code.