#13 - clean up classes from v1 to v2