started cleanup of animation code