Removed numbers from node names and some unused functions.