Commented out laser stuff, cleaned up code