add raster support; strip obsolete code