clean up some redundant code
scatter 2d no longer uses switch on shader to transition