Fixed remove operation