Fix light copy and removal