More animation definition clean up