Remove unnecessary ids after bfb30eed59