Fixed indicator removal