Cleanup server.init

Cleanup of server.init