Remove use of MapAlgebra