class sprite cleanup
Merge commit '86052d21a82cb6cea4df3d6ef36aabd618855ff1'