Removing unused methods, minor fixes in EndNode definition.