Cleaned up generics
Merge pull request #603 from hector-client/row_clear

Cleaned up generics