Add elegant way to remove row