Clean and move lights to common