More cleanup on the spatial tab.