Removed unused code
Merge remote-tracking branch 'origin/support_for_animations' into next

* origin/support_for_animations:
  Removed unused code