minor tweaks to imports in client and removed console logs from server