Move away unnecessary stuff from animationplayer