Fix Row class instantiation and row removal.