Revert "trimmed server"

This reverts commit c13b74184845685be2fc52c6747b22cec8b49ec7.
Revert "Revert "trimmed server""

This reverts commit 4e3a8b79dc1b384904b184206b447cb2bb26c6f5.