Removing dead code from tree and calcnode; continuing compilation fixes