Upgrade to 4.1 and add missing plugins
remove samples