Fixed endpoint removal.