Fix manipulation APIs with removed elements