Remove unused terrain "table" and "chair" (they're furniture now, of course).  Mark a few terrains as "container."