Fixed Container so that it removes itself correctly