Code cleanup
remove calls to Laser class