Clean up containers after common tasks.
WIP