Added flush rows back in, removed some cruft