Removed ServerActivity and ClientActivity since they were not required.