cleanup looks good but cant get new animations to work so left as is for now