Improve sentinel removal