Merge "Refactor stack removal methods"