Code cleanup

Removed 'Fun' node and related references to it.