Cleaned up cruft from servetree