Lamp is animated again. Plus removing dead code