Correctly handle forward of remaining data on removal