Added slight optimization to removing nacks