Add cleanup for raster in removeLayer