Removed unnecessary code.
Fixed an animation bug.
merging