remove node from this way only, and some fixes