Rest of the cleanup before trying to use Converters for Adapters...