Fixed remove/erase methods.