Fixup! Move Cleaning the Container to the constructor.