[OE-3662] Laser fixes
Removing redundant code