(Animation) Reorder animation variables according to size & remove unused