Added cleanup on module remove
Added remove-node function