Add clear glass + cleanup