Removed AP and PE from node, they are available in ORBIT
updated usages or node