remove cutter and add geometry implementation