cleaning up stuff to merge latest our-boxen