Remove Container
Refactoring