Animations AIO: Cleanup

PS2: More cleanup.

Change-Id: Iae4ede4ee8f3106edd7f5b4931fcc3e361c0b8ce
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>