Removed cruft from server