Cleanup blend
Add legacy code for bit settings.optional