Changes to clean up sprites