Remove animation overkill