Remove Convert class (for now)