Misc fixes

Removed deprecated function, stripping out bad values from rows on creation