bundle update and other
Remove a workaround not necessary anymore