Merge "Moved swift container cleanup to a class method."