Clean up Plug and Adapter option merging