Updated removeAt()