Animation API cleaned up