Updating upstream
Remove Container methods accepted upstream