Sprite changes and cliping out legacy code