Some lightbox cleanup