Cleaned up

Deleted unnecessary commented out code and methods
Lasers correctly removed