Cleanup spatial types #631