Clean up code before adding another Container