Revert "Revert "Revert "Revert "trimmed server""""

This reverts commit d69ec0aa0bc44e91c8da71cd6cc3f29689c567bb.