Revert "More Playing around with lamps"

This reverts commit f93974f826cb506d4417f49869505c3a76cd4559.