remove leaf, add multiport and help