Reduce Attack Surface

Reduce Attack Surface