got rid of contract/expand from shader utils