GenericMatrix minor refactoring

Unnecessary methods removed