Working version with remove row