Added removing toTag elements when cleaning