Merge "Remove unused code in StagingManager"