Remove Convert module, replace with Conv. Remove extraneous tests.
Cleanup