Remove unnecessary ID checks