Lots of sprite related cleanup.