Minor changes after SDK upgrade along with a code clean up of old redundant animation editor.