Simpler init-server file
Remove old cruft
Some cleanup
Use full init as default plus fallback