masonry + cleanup