Cleaned up unnecessary generic classes. unit tests don't build at the moment.