Initial converter cleanup.