Cleanup. Default value for raster should be None.