Make removal less breaking