Merge "Remove old animation" into klp-dev