Minor merge cleanup

Remove extraneous cleanContainerForRefresh and streamline refresh contents assignment