Masonry works again, and cleanup