Completely fix new animations and remove some unused methods