cleanup Node types, closes #1726