Revert "Revert "Revert "trimmed server"""

This reverts commit f4ef88670a9c294671c2776c4da7f1e711a6ab5d.