remove extra lidar and rename remainig lidar to 'lidar'