Removed client cruft