Eliminated useless animations