Some cleanup. Now only using Sprite