Cleanup for demo and added auto-lights app