Remove container dependency
Remove container dependency