remove dependancy on laser_geometry