Add entity removal and id re-use