gallery prototype + cleanup